[ABW-2674] Pool redemption/contribution tx preview types #745
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Solid work! Don't forget the todos. Also will this be included in this PR?
| @@ -69,6 +69,8 @@ data class PoolWithResourceResponse( | |||
| val poolUnitAddress: String, | |||
There was a problem hiding this comment.
So this can be deleted now, since the same info exists in the poolMetadata.
| is TransferableResource.LsuAmount -> GuaranteeAssertion.ForAmount( | ||
| amount = transferable.amount * predicted.guaranteeOffset.toBigDecimal(), | ||
| instructionIndex = predicted.instructionIndex | ||
| ) | ||
| is TransferableResource.StakeClaimNft -> null |
There was a problem hiding this comment.
Do we need to ask Matt about stake claim NFTs and their assertions?
| data class Pool( | ||
| val address: String, | ||
| val poolUnitAddress: String, | ||
| val metadata: List<Metadata>, |
| @@ -23,10 +23,10 @@ class GetPoolUnitDetailsUseCase @Inject constructor( | |||
| val poolAddress = poolResource.poolAddress ?: return@then runCatching { | |||
| error("Resource $resourceAddress is not associated with a pool") | |||
| } | |||
| stateRepository.getPool(poolAddress).map { | |||
| stateRepository.getPools(setOf(poolAddress)).map { | |||
There was a problem hiding this comment.
Better to use mapCatching here since first() can throw an exception.
| @@ -321,7 +321,7 @@ class TransactionReviewViewModel @Inject constructor( | |||
| ) | |||
|
|
|||
| val isRawManifestToggleVisible: Boolean | |||
| get() = previewType is PreviewType.Transfer | |||
| get() = true // previewType is PreviewType.Transfer | |||
There was a problem hiding this comment.
Why is this set to always true?
There was a problem hiding this comment.
fixed, was for testing
Comment on lines
+436
to
+503
| sealed interface Transfer : PreviewType { | ||
| val from: List<AccountWithTransferableResources> | ||
| val to: List<AccountWithTransferableResources> | ||
|
|
||
| data class Staking( | ||
| override val from: List<AccountWithTransferableResources>, | ||
| override val to: List<AccountWithTransferableResources>, | ||
| val validators: List<ValidatorDetail>, | ||
| val actionType: ActionType | ||
| ) : Transfer { | ||
| enum class ActionType { | ||
| Stake, Unstake, ClaimStake | ||
| } | ||
| } | ||
|
|
||
| fun getNewlyCreatedResources() = (from + to).map { allTransfers -> | ||
| allTransfers.resources.filter { it.transferable.isNewlyCreated }.map { it.transferable } | ||
| }.flatten() | ||
| } | ||
| data class Pool( | ||
| override val from: List<AccountWithTransferableResources>, | ||
| override val to: List<AccountWithTransferableResources>, | ||
| val pools: List<com.babylon.wallet.android.domain.model.resources.Pool>, | ||
| val actionType: ActionType | ||
| ) : Transfer { | ||
| enum class ActionType { | ||
| Contribution, Redemption | ||
| } | ||
| } | ||
|
|
||
| data class GeneralTransfer( | ||
| override val from: List<AccountWithTransferableResources>, | ||
| override val to: List<AccountWithTransferableResources>, | ||
| val badges: List<Badge> = emptyList(), | ||
| val dApps: List<Pair<DApp, Boolean>> = emptyList() | ||
| ) : Transfer { | ||
|
|
||
| data class Staking( | ||
| val from: List<AccountWithTransferableResources>, | ||
| val to: List<AccountWithTransferableResources>, | ||
| val validators: List<ValidatorDetail>, | ||
| val actionType: ActionType | ||
| ) : PreviewType { | ||
| enum class ActionType { | ||
| Stake, Unstake, ClaimStake | ||
| fun getNewlyCreatedResources() = (from + to).map { allTransfers -> | ||
| allTransfers.resources.filter { it.transferable.isNewlyCreated }.map { it.transferable } | ||
| }.flatten() |
| getProfileUseCase: GetProfileUseCase, | ||
| resources: List<Resource>, | ||
| involvedPools: List<Pool> | ||
| ): PreviewType { |
There was a problem hiding this comment.
You can set the return type to be more explicit like PreviewType.Transfer.Pool. The same with the rest of the analysis methods.
Comment on lines
71
to
73
| manifest.toPrettyString().let { prettyString -> | ||
| logger.d(prettyString) | ||
| } |
There was a problem hiding this comment.
Maybe better of with:
logger.d(manifest.toPrettyString())
Comment on lines
+24
to
+27
| val poolSectionLabel = when (previewType.actionType) { | ||
| PreviewType.Transfer.Pool.ActionType.Contribution -> "Contributing to pools" | ||
| PreviewType.Transfer.Pool.ActionType.Redemption -> "Redeeming from pools" |
| @Composable | ||
| fun Pool( | ||
| modifier: Modifier = Modifier, | ||
| pool: Pool |
micbakos-rdx
approved these changes
Jan 15, 2024
giannis-rdx
approved these changes
Jan 16, 2024
| } | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| data class FetchPoolsResult( |
There was a problem hiding this comment.
why fetch? Fetch is the action
PoolsResponse
| @@ -99,19 +116,25 @@ sealed interface TransferableResource { | |||
| get() = resource.resourceAddress | |||
| val isNewlyCreated: Boolean | |||
|
|
|||
| data class Amount( | |||
| val amount: BigDecimal, | |||
| data class FungibleAmount( | |||
jakub-rdx
force-pushed
the
feature/ABW-2674-pool-redeem-controbute-tx-types
branch
from
df475b1
to
221a495
Compare
jakub-rdx
force-pushed
the
feature/ABW-2674-pool-redeem-controbute-tx-types
branch
from
30efd2a
to
9a8bf7d
Compare
|
micbakos-rdx
deleted the
feature/ABW-2674-pool-redeem-controbute-tx-types
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
How to test
Video
screen-20240104-091533.2.1.mp4
PR submission checklist